Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 12 Feb 2011 10:08:19 +0000 (02:08 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 12 Feb 2011 10:08:19 +0000 (02:08 -0800)
commit4e6de32c5aaa8ce3f2440037807b82b4f7d0371b
treee16f9a7b253c9cc9514f85be4eb05556af7d7af9
parent6fbe69594379101d900071e25195dd804b92df9c
parent513093e1ac2f310fbacb0ed535fb0675cf6afccb
Merge from mainline.
src/ChangeLog